Various tweaks

diff --git a/debian/changelog b/debian/changelog
index 707bc13e64c6a9f52d98386caf846cad933bc98c..247a927f6e0e8cbfa43aa5e6b1e246388a2e8a27 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gpsbabel (1.3.2) unstable; urgency=low
+
+  * New upstream version.  Closes: #383899, #380533, #304178.
+  * Style docs now included.  Closes: #348986.  (Note: README.style
+    no longer exists)
+
+ -- John Goerzen <jgoerzen@complete.org>  Fri, 17 Nov 2006 03:57:30 -0600
+
 gpsbabel (1.2.7-1) unstable; urgency=low
 
   * New upstream version.  Closes: #317559.

diff --git a/debian/control b/debian/control
index 978a1a8c1357259b6fb5f4b4914240795c124593..e3e60be8d4fb0be04137bce633cc80766d852fa5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gpsbabel
 Section: utils
 Priority: optional
 Maintainer: John Goerzen <jgoerzen@complete.org>
-Build-Depends: debhelper (>= 4.0.0), libexpat1-dev, tetex-bin, tetex-base, libusb-dev
+Build-Depends: debhelper (>= 4.0.0), libexpat1-dev, tetex-bin, tetex-base, libusb-dev, expat, libxml2-utils, xsltproc
 Standards-Version: 3.6.0
 
 Package: gpsbabel

diff --git a/debian/docs b/debian/docs
index fb3a88292ac0755ec359c2af1e98c517e6eeabba..ddb9a541bab4dbf7ed743434c7b83576d7c71563 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,6 +1,2 @@
 README
-README.contrib
-README.magnav
-README.mapconverter
-README.psp
-README.xmapwpt
+README.*

diff --git a/debian/rules b/debian/rules
index d62b886bb92f8647f3b4c720c8bb48a5be93ee8d..85f92a2226292667acbacbea6e3abe17c78495aa 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,8 @@ endif
 configure: configure-stamp
 configure-stamp:
        dh_testdir
+       $(SHELL) ./configure --with-zlib=system --with-doc=debian/doctmp \
+               --prefix=/usr
        # Add here commands to configure the package.
 
        touch configure-stamp
@@ -33,6 +35,7 @@ build: build-stamp
 build-stamp: configure-stamp 
        dh_testdir
 
+       mkdir debian/doctmp
        # Add here commands to compile the package.
        $(MAKE)
        chmod u+x testo
@@ -51,6 +54,7 @@ clean:
        # Add here commands to clean up after the build process.
        -$(MAKE) clean
        -cd doc && $(MAKE) clean
+       -rm -r debian/doctmp
 
        dh_clean 
 
@@ -61,8 +65,8 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/gpsbabel.
-       #$(MAKE) install DESTDIR=$(CURDIR)/debian/gpsbabel
-       install gpsbabel $(CURDIR)/debian/gpsbabel/usr/bin
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/gpsbabel
+       #install gpsbabel $(CURDIR)/debian/gpsbabel/usr/bin
 
 
 # Build architecture-independent files here.